Glogbook, Gnav_trl
authorRobert Lipe <robertlipe@gmail.com>
Thu, 17 Mar 2022 02:02:15 +0000 (21:02 -0500)
committerRobert Lipe <robertlipe@gmail.com>
Thu, 17 Mar 2022 02:02:15 +0000 (21:02 -0500)
16 files changed:
CMakeLists.txt
GPSBabel.pro
deprecated/glogbook.cc [new file with mode: 0644]
deprecated/gnav_trl.cc [new file with mode: 0644]
glogbook.cc [deleted file]
gnav_trl.cc [deleted file]
reference/format0.txt
reference/format1.txt
reference/format2.txt
reference/format3.txt
reference/help.txt
testo.d/glogbook.test [deleted file]
testo.d/gnav_trl.test [deleted file]
vecs.cc
xmldoc/formats/glogbook.xml [deleted file]
xmldoc/formats/gnav_trl.xml [deleted file]

index 77f91f5288a2c0b9a5b630c68f049965c3d3f58d..97364fb4b90c2c7a60b990ddca70cc52fbddaac6 100644 (file)
@@ -102,8 +102,6 @@ set(ALL_FMTS ${MINIMAL_FMTS}
   ggv_log.cc
   ggv_ovl.cc
   globalsat_sport.cc
-  glogbook.cc
-  gnav_trl.cc
   googledir.cc
   gpssim.cc
   gtm.cc
index 4a8a9f9c3f335312ebc6f51c228e503d316277ee..5c9843cd004fabc4b4594cb8f608b891e342fd3f 100644 (file)
@@ -77,8 +77,6 @@ ALL_FMTS = $$MINIMAL_FMTS \
   ggv_log.cc \
   ggv_ovl.cc \
   globalsat_sport.cc \
-  glogbook.cc \
-  gnav_trl.cc \
   googledir.cc \
   gpssim.cc \
   gtm.cc \
diff --git a/deprecated/glogbook.cc b/deprecated/glogbook.cc
new file mode 100644 (file)
index 0000000..f381c26
--- /dev/null
@@ -0,0 +1,192 @@
+/*
+    Access Garmin Logbook (Forerunner/Foretracker) data files.
+
+    Copyright (C) 2004, 2005, 2006, 2007  Robert Lipe, robertlipe+source@gpsbabel.org
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+ */
+
+#include "defs.h"
+#include "src/core/file.h"
+#include "xmlgeneric.h"
+
+#include <QXmlStreamAttributes>
+#include <QXmlStreamWriter>
+
+static gbfile* ofd;
+static QString ostring;
+static QXmlStreamWriter writer(&ostring);
+
+static Waypoint* wpt_tmp;
+static route_head* trk_head;
+
+#define MYNAME "glogbook"
+
+static
+QVector<arglist_t> glogbook_args = {
+};
+
+/* Tracks */
+static xg_callback     gl_trk_s;
+// static xg_callback  gl_trk_ident;
+static xg_callback     gl_trk_pnt_s, gl_trk_pnt_e;
+static xg_callback     gl_trk_utc;
+static xg_callback     gl_trk_lat;
+static xg_callback     gl_trk_long;
+static xg_callback     gl_trk_alt;
+
+static xg_tag_mapping gl_map[] = {
+  { gl_trk_s,    cb_start, "/History/Run/Track" },
+  { gl_trk_pnt_s,cb_start, "/History/Run/Track/Trackpoint/Position" },
+  { gl_trk_pnt_e,cb_end,   "/History/Run/Track/Trackpoint/Position" },
+  { gl_trk_lat,  cb_cdata, "/History/Run/Track/Trackpoint/Position/Latitude" },
+  { gl_trk_long, cb_cdata, "/History/Run/Track/Trackpoint/Position/Longitude" },
+  { gl_trk_alt,  cb_cdata, "/History/Run/Track/Trackpoint/Position/Altitude" },
+  { gl_trk_utc,  cb_cdata, "/History/Run/Track/Trackpoint/Time" },
+  { nullptr,   (xg_cb_type)0,         nullptr}
+};
+
+static void
+glogbook_rd_init(const QString& fname)
+{
+  xml_init(fname, gl_map, nullptr);
+}
+
+static void
+glogbook_read()
+{
+  xml_read();
+}
+
+static void
+glogbook_rd_deinit()
+{
+  xml_deinit();
+}
+
+static void
+glogbook_wr_init(const QString& fname)
+{
+  ofd = gbfopen(fname, "w", MYNAME);
+  writer.setAutoFormatting(true);
+  writer.setAutoFormattingIndent(4);
+  writer.writeStartDocument();
+}
+
+static void
+glogbook_wr_deinit()
+{
+  writer.writeEndDocument();
+  gbfputs(ostring,ofd);
+  gbfclose(ofd);
+  ofd = nullptr;
+}
+
+static void
+glogbook_waypt_pr(const Waypoint* wpt)
+{
+  writer.writeStartElement(QStringLiteral("Trackpoint"));
+
+  writer.writeStartElement(QStringLiteral("Position"));
+  writer.writeTextElement(QStringLiteral("Latitude"), QString::number(wpt->latitude,'f', 5));
+  writer.writeTextElement(QStringLiteral("Longitude"), QString::number(wpt->longitude,'f', 5));
+  writer.writeTextElement(QStringLiteral("Altitude"), QString::number(wpt->altitude,'f', 3));
+  writer.writeEndElement(); // Position
+
+  writer.writeTextElement(QStringLiteral("Time"), wpt->GetCreationTime().toPrettyString());
+  writer.writeEndElement(); // Trackpoint
+}
+
+static void
+glogbook_hdr(const route_head*)
+{
+  writer.writeStartElement(QStringLiteral("Track"));
+}
+
+static void
+glogbook_ftr(const route_head*)
+{
+  writer.writeEndElement();
+}
+
+static void
+glogbook_write()
+{
+#if 0
+  gbfprintf(ofd, "<?xml version=\"1.0\" ?>\n");
+  gbfprintf(ofd, "<History xmlns=\"http://www.garmin.com/xmlschemas/ForerunnerLogbook\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.garmin.com/xmlschemas/ForerunnerLogbook http://www.garmin.com/xmlschemas/ForerunnerLogbookv1.xsd\" version=\"1\">\n");
+  gbfprintf(ofd, "    <Run>\n");
+#else
+  writer.writeStartElement(QStringLiteral("History"));
+  writer.writeStartElement(QStringLiteral("Run"));
+#endif
+  track_disp_all(glogbook_hdr, glogbook_ftr, glogbook_waypt_pr);
+  writer.writeEndElement(); // Run
+  writer.writeEndElement(); // History
+}
+
+void   gl_trk_s(xg_string, const QXmlStreamAttributes*)
+{
+  trk_head = new route_head;
+  track_add_head(trk_head);
+}
+
+void   gl_trk_pnt_s(xg_string, const QXmlStreamAttributes*)
+{
+  wpt_tmp = new Waypoint;
+}
+
+void   gl_trk_pnt_e(xg_string, const QXmlStreamAttributes*)
+{
+  track_add_wpt(trk_head, wpt_tmp);
+}
+
+void   gl_trk_utc(xg_string args, const QXmlStreamAttributes*)
+{
+  wpt_tmp->SetCreationTime(xml_parse_time(args));
+}
+
+void   gl_trk_lat(xg_string args, const QXmlStreamAttributes*)
+{
+  wpt_tmp->latitude = args.toDouble();
+}
+
+void   gl_trk_long(xg_string args, const QXmlStreamAttributes*)
+{
+  wpt_tmp->longitude = args.toDouble();
+}
+
+void   gl_trk_alt(xg_string args, const QXmlStreamAttributes*)
+{
+  wpt_tmp->altitude = args.toDouble();
+}
+
+
+
+ff_vecs_t glogbook_vecs = {
+  ff_type_file,
+  { ff_cap_none, (ff_cap)(ff_cap_read | ff_cap_write), ff_cap_none},
+  glogbook_rd_init,
+  glogbook_wr_init,
+  glogbook_rd_deinit,
+  glogbook_wr_deinit,
+  glogbook_read,
+  glogbook_write,
+  nullptr,
+  &glogbook_args,
+  CET_CHARSET_ASCII, 0 /* CET-REVIEW */
+  , NULL_POS_OPS
+};
diff --git a/deprecated/gnav_trl.cc b/deprecated/gnav_trl.cc
new file mode 100644 (file)
index 0000000..51097f0
--- /dev/null
@@ -0,0 +1,158 @@
+/*
+
+    Support for Google Navigator tracklines (.trl).
+
+    Copyright (C) 2008 Olaf Klein, o.b.klein@gpsbabel.org
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+ */
+
+#include "defs.h"
+
+#define MYNAME "gnav_trl"
+
+static
+QVector<arglist_t> gnav_trl_args = {
+};
+
+struct gnav_trl_t {
+  uint32_t time;
+  float lat;
+  float lon;
+  uint32_t alt;
+};
+
+static gbfile* fin, *fout;
+
+/*******************************************************************************
+* %%%        global callbacks called by gpsbabel main process              %%% *
+*******************************************************************************/
+
+static void
+gnav_trl_rd_init(const QString& fname)
+{
+  fin = gbfopen_le(fname, "rb", MYNAME);
+}
+
+static void
+gnav_trl_rw_init(const QString& fname)
+{
+  fout = gbfopen_le(fname, "wb", MYNAME);
+}
+
+static void
+gnav_trl_rd_deinit()
+{
+  gbfclose(fin);
+}
+
+static void
+gnav_trl_rw_deinit()
+{
+  gbfclose(fout);
+}
+
+static double
+read_altitude(void* ptr)
+{
+  auto* i = (unsigned char*) ptr;
+  char buf[sizeof(float)];
+  le_write32(&buf, i[2] << 24 | i[1] << 16 | i[0] <<8 | i[3]);
+  return le_read_float(&buf);
+}
+
+static void
+write_altitude(void* ptr, const float alt)
+{
+  char buf[sizeof(float)];
+  auto* i = (unsigned char*) &buf;
+  le_write_float(&buf, alt);
+  le_write32(ptr, i[0] << 24 | i[3] << 16 | i[2] << 8 | i[1]);
+}
+
+static void
+gnav_trl_read()
+{
+  route_head* trk = nullptr;
+
+  while (! gbfeof(fin)) {
+    gnav_trl_t rec;
+
+    if (gbfread(&rec, sizeof(rec), 1, fin) != 1) {
+      fatal(MYNAME ": Unexpected EOF (end of file)!\n");
+    }
+
+    auto* wpt = new Waypoint;
+
+    wpt->SetCreationTime(le_read32(&rec.time));
+    wpt->latitude = le_read_float(&rec.lat);
+    wpt->longitude = le_read_float(&rec.lon);
+    wpt->altitude = read_altitude(&rec.alt);
+
+    if (trk == nullptr) {
+      trk = new route_head;
+      track_add_head(trk);
+    }
+    track_add_wpt(trk, wpt);
+  }
+}
+
+static void
+gnav_trl_write_trkpt(const Waypoint* wpt)
+{
+  gnav_trl_t rec;
+
+  le_write32(&rec.time, wpt->GetCreationTime().toTime_t());
+  le_write_float(&rec.lat, wpt->latitude);
+  le_write_float(&rec.lon, wpt->longitude);
+  if (wpt->altitude != unknown_alt) {
+    write_altitude(&rec.alt, wpt->altitude);
+  } else {
+    write_altitude(&rec.alt, 0);
+  }
+
+  gbfwrite(&rec, sizeof(rec), 1, fout);
+}
+
+static void
+gnav_trl_write()
+{
+  track_disp_all(nullptr, nullptr, gnav_trl_write_trkpt);
+}
+
+
+/**************************************************************************/
+
+ff_vecs_t gnav_trl_vecs = {
+  ff_type_file,
+  {
+    ff_cap_none                        /* waypoints */,
+    (ff_cap)(ff_cap_read | ff_cap_write)       /* tracks */,
+    ff_cap_none                        /* routes */
+  },
+  gnav_trl_rd_init,
+  gnav_trl_rw_init,
+  gnav_trl_rd_deinit,
+  gnav_trl_rw_deinit,
+  gnav_trl_read,
+  gnav_trl_write,
+  nullptr,
+  &gnav_trl_args,
+  CET_CHARSET_UTF8, 1  /* CET - do nothing ! */
+  , NULL_POS_OPS
+};
+
+/**************************************************************************/
diff --git a/glogbook.cc b/glogbook.cc
deleted file mode 100644 (file)
index f381c26..0000000
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
-    Access Garmin Logbook (Forerunner/Foretracker) data files.
-
-    Copyright (C) 2004, 2005, 2006, 2007  Robert Lipe, robertlipe+source@gpsbabel.org
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
- */
-
-#include "defs.h"
-#include "src/core/file.h"
-#include "xmlgeneric.h"
-
-#include <QXmlStreamAttributes>
-#include <QXmlStreamWriter>
-
-static gbfile* ofd;
-static QString ostring;
-static QXmlStreamWriter writer(&ostring);
-
-static Waypoint* wpt_tmp;
-static route_head* trk_head;
-
-#define MYNAME "glogbook"
-
-static
-QVector<arglist_t> glogbook_args = {
-};
-
-/* Tracks */
-static xg_callback     gl_trk_s;
-// static xg_callback  gl_trk_ident;
-static xg_callback     gl_trk_pnt_s, gl_trk_pnt_e;
-static xg_callback     gl_trk_utc;
-static xg_callback     gl_trk_lat;
-static xg_callback     gl_trk_long;
-static xg_callback     gl_trk_alt;
-
-static xg_tag_mapping gl_map[] = {
-  { gl_trk_s,    cb_start, "/History/Run/Track" },
-  { gl_trk_pnt_s,cb_start, "/History/Run/Track/Trackpoint/Position" },
-  { gl_trk_pnt_e,cb_end,   "/History/Run/Track/Trackpoint/Position" },
-  { gl_trk_lat,  cb_cdata, "/History/Run/Track/Trackpoint/Position/Latitude" },
-  { gl_trk_long, cb_cdata, "/History/Run/Track/Trackpoint/Position/Longitude" },
-  { gl_trk_alt,  cb_cdata, "/History/Run/Track/Trackpoint/Position/Altitude" },
-  { gl_trk_utc,  cb_cdata, "/History/Run/Track/Trackpoint/Time" },
-  { nullptr,   (xg_cb_type)0,         nullptr}
-};
-
-static void
-glogbook_rd_init(const QString& fname)
-{
-  xml_init(fname, gl_map, nullptr);
-}
-
-static void
-glogbook_read()
-{
-  xml_read();
-}
-
-static void
-glogbook_rd_deinit()
-{
-  xml_deinit();
-}
-
-static void
-glogbook_wr_init(const QString& fname)
-{
-  ofd = gbfopen(fname, "w", MYNAME);
-  writer.setAutoFormatting(true);
-  writer.setAutoFormattingIndent(4);
-  writer.writeStartDocument();
-}
-
-static void
-glogbook_wr_deinit()
-{
-  writer.writeEndDocument();
-  gbfputs(ostring,ofd);
-  gbfclose(ofd);
-  ofd = nullptr;
-}
-
-static void
-glogbook_waypt_pr(const Waypoint* wpt)
-{
-  writer.writeStartElement(QStringLiteral("Trackpoint"));
-
-  writer.writeStartElement(QStringLiteral("Position"));
-  writer.writeTextElement(QStringLiteral("Latitude"), QString::number(wpt->latitude,'f', 5));
-  writer.writeTextElement(QStringLiteral("Longitude"), QString::number(wpt->longitude,'f', 5));
-  writer.writeTextElement(QStringLiteral("Altitude"), QString::number(wpt->altitude,'f', 3));
-  writer.writeEndElement(); // Position
-
-  writer.writeTextElement(QStringLiteral("Time"), wpt->GetCreationTime().toPrettyString());
-  writer.writeEndElement(); // Trackpoint
-}
-
-static void
-glogbook_hdr(const route_head*)
-{
-  writer.writeStartElement(QStringLiteral("Track"));
-}
-
-static void
-glogbook_ftr(const route_head*)
-{
-  writer.writeEndElement();
-}
-
-static void
-glogbook_write()
-{
-#if 0
-  gbfprintf(ofd, "<?xml version=\"1.0\" ?>\n");
-  gbfprintf(ofd, "<History xmlns=\"http://www.garmin.com/xmlschemas/ForerunnerLogbook\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.garmin.com/xmlschemas/ForerunnerLogbook http://www.garmin.com/xmlschemas/ForerunnerLogbookv1.xsd\" version=\"1\">\n");
-  gbfprintf(ofd, "    <Run>\n");
-#else
-  writer.writeStartElement(QStringLiteral("History"));
-  writer.writeStartElement(QStringLiteral("Run"));
-#endif
-  track_disp_all(glogbook_hdr, glogbook_ftr, glogbook_waypt_pr);
-  writer.writeEndElement(); // Run
-  writer.writeEndElement(); // History
-}
-
-void   gl_trk_s(xg_string, const QXmlStreamAttributes*)
-{
-  trk_head = new route_head;
-  track_add_head(trk_head);
-}
-
-void   gl_trk_pnt_s(xg_string, const QXmlStreamAttributes*)
-{
-  wpt_tmp = new Waypoint;
-}
-
-void   gl_trk_pnt_e(xg_string, const QXmlStreamAttributes*)
-{
-  track_add_wpt(trk_head, wpt_tmp);
-}
-
-void   gl_trk_utc(xg_string args, const QXmlStreamAttributes*)
-{
-  wpt_tmp->SetCreationTime(xml_parse_time(args));
-}
-
-void   gl_trk_lat(xg_string args, const QXmlStreamAttributes*)
-{
-  wpt_tmp->latitude = args.toDouble();
-}
-
-void   gl_trk_long(xg_string args, const QXmlStreamAttributes*)
-{
-  wpt_tmp->longitude = args.toDouble();
-}
-
-void   gl_trk_alt(xg_string args, const QXmlStreamAttributes*)
-{
-  wpt_tmp->altitude = args.toDouble();
-}
-
-
-
-ff_vecs_t glogbook_vecs = {
-  ff_type_file,
-  { ff_cap_none, (ff_cap)(ff_cap_read | ff_cap_write), ff_cap_none},
-  glogbook_rd_init,
-  glogbook_wr_init,
-  glogbook_rd_deinit,
-  glogbook_wr_deinit,
-  glogbook_read,
-  glogbook_write,
-  nullptr,
-  &glogbook_args,
-  CET_CHARSET_ASCII, 0 /* CET-REVIEW */
-  , NULL_POS_OPS
-};
diff --git a/gnav_trl.cc b/gnav_trl.cc
deleted file mode 100644 (file)
index 51097f0..0000000
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
-
-    Support for Google Navigator tracklines (.trl).
-
-    Copyright (C) 2008 Olaf Klein, o.b.klein@gpsbabel.org
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
- */
-
-#include "defs.h"
-
-#define MYNAME "gnav_trl"
-
-static
-QVector<arglist_t> gnav_trl_args = {
-};
-
-struct gnav_trl_t {
-  uint32_t time;
-  float lat;
-  float lon;
-  uint32_t alt;
-};
-
-static gbfile* fin, *fout;
-
-/*******************************************************************************
-* %%%        global callbacks called by gpsbabel main process              %%% *
-*******************************************************************************/
-
-static void
-gnav_trl_rd_init(const QString& fname)
-{
-  fin = gbfopen_le(fname, "rb", MYNAME);
-}
-
-static void
-gnav_trl_rw_init(const QString& fname)
-{
-  fout = gbfopen_le(fname, "wb", MYNAME);
-}
-
-static void
-gnav_trl_rd_deinit()
-{
-  gbfclose(fin);
-}
-
-static void
-gnav_trl_rw_deinit()
-{
-  gbfclose(fout);
-}
-
-static double
-read_altitude(void* ptr)
-{
-  auto* i = (unsigned char*) ptr;
-  char buf[sizeof(float)];
-  le_write32(&buf, i[2] << 24 | i[1] << 16 | i[0] <<8 | i[3]);
-  return le_read_float(&buf);
-}
-
-static void
-write_altitude(void* ptr, const float alt)
-{
-  char buf[sizeof(float)];
-  auto* i = (unsigned char*) &buf;
-  le_write_float(&buf, alt);
-  le_write32(ptr, i[0] << 24 | i[3] << 16 | i[2] << 8 | i[1]);
-}
-
-static void
-gnav_trl_read()
-{
-  route_head* trk = nullptr;
-
-  while (! gbfeof(fin)) {
-    gnav_trl_t rec;
-
-    if (gbfread(&rec, sizeof(rec), 1, fin) != 1) {
-      fatal(MYNAME ": Unexpected EOF (end of file)!\n");
-    }
-
-    auto* wpt = new Waypoint;
-
-    wpt->SetCreationTime(le_read32(&rec.time));
-    wpt->latitude = le_read_float(&rec.lat);
-    wpt->longitude = le_read_float(&rec.lon);
-    wpt->altitude = read_altitude(&rec.alt);
-
-    if (trk == nullptr) {
-      trk = new route_head;
-      track_add_head(trk);
-    }
-    track_add_wpt(trk, wpt);
-  }
-}
-
-static void
-gnav_trl_write_trkpt(const Waypoint* wpt)
-{
-  gnav_trl_t rec;
-
-  le_write32(&rec.time, wpt->GetCreationTime().toTime_t());
-  le_write_float(&rec.lat, wpt->latitude);
-  le_write_float(&rec.lon, wpt->longitude);
-  if (wpt->altitude != unknown_alt) {
-    write_altitude(&rec.alt, wpt->altitude);
-  } else {
-    write_altitude(&rec.alt, 0);
-  }
-
-  gbfwrite(&rec, sizeof(rec), 1, fout);
-}
-
-static void
-gnav_trl_write()
-{
-  track_disp_all(nullptr, nullptr, gnav_trl_write_trkpt);
-}
-
-
-/**************************************************************************/
-
-ff_vecs_t gnav_trl_vecs = {
-  ff_type_file,
-  {
-    ff_cap_none                        /* waypoints */,
-    (ff_cap)(ff_cap_read | ff_cap_write)       /* tracks */,
-    ff_cap_none                        /* routes */
-  },
-  gnav_trl_rd_init,
-  gnav_trl_rw_init,
-  gnav_trl_rd_deinit,
-  gnav_trl_rw_deinit,
-  gnav_trl_read,
-  gnav_trl_write,
-  nullptr,
-  &gnav_trl_args,
-  CET_CHARSET_UTF8, 1  /* CET - do nothing ! */
-  , NULL_POS_OPS
-};
-
-/**************************************************************************/
index 2b7a1e2a466dd9c3fe7c0c0e8417cd8866ce8430..185428c9eff9d9e975d321bfcf0cee8a727ae1df 100644 (file)
@@ -23,7 +23,6 @@ gpssim        gpssim  Franson GPSGate Simulation
 fugawi txt     Fugawi
 garmin301              Garmin 301 Custom position and heartrate
 garmin_g1000   csv     Garmin G1000 datalog input filter file
-glogbook       xml     Garmin Logbook XML
 gdb    gdb     Garmin MapSource - gdb
 garmin_txt     txt     Garmin MapSource - txt (tab delimited)
 garmin_poi             Garmin POI database
@@ -41,7 +40,6 @@ dg-200                GlobalSat DG-200 Download
 globalsat              GlobalSat GH625XT GPS training watch
 googledir      xml     Google Directions XML
 kml    kml     Google Earth (Keyhole) Markup Language
-gnav_trl       trl     Google Navigator Tracklines (.trl)
 land_air_sea   txt     GPS Tracking Key Pro text
 gtm    gtm     GPS TrackMaker
 arc    txt     GPSBabel arc filter file
index 16a7776e6473ef3284a1028bf3248f917a38d390..d7245d3366985582097839bec824d5e6adf48877 100644 (file)
@@ -26,7 +26,6 @@ file  gpssim  gpssim  Franson GPSGate Simulation
 file   fugawi  txt     Fugawi
 file   garmin301               Garmin 301 Custom position and heartrate
 file   garmin_g1000    csv     Garmin G1000 datalog input filter file
-file   glogbook        xml     Garmin Logbook XML
 file   gdb     gdb     Garmin MapSource - gdb
 file   garmin_txt      txt     Garmin MapSource - txt (tab delimited)
 file   garmin_poi              Garmin POI database
@@ -46,7 +45,6 @@ serial        dg-200          GlobalSat DG-200 Download
 serial globalsat               GlobalSat GH625XT GPS training watch
 file   googledir       xml     Google Directions XML
 file   kml     kml     Google Earth (Keyhole) Markup Language
-file   gnav_trl        trl     Google Navigator Tracklines (.trl)
 file   land_air_sea    txt     GPS Tracking Key Pro text
 file   gtm     gtm     GPS TrackMaker
 file   arc     txt     GPSBabel arc filter file
index 268d82607a3a94c67bcf078f021a95699758f0d8..96eedebc57f5892a147ab268eacb2987e38f509f 100644 (file)
@@ -26,7 +26,6 @@ file  -w-w-w  gpssim  gpssim  Franson GPSGate Simulation
 file   rw----  fugawi  txt     Fugawi
 file   rw----  garmin301               Garmin 301 Custom position and heartrate
 file   --rw--  garmin_g1000    csv     Garmin G1000 datalog input filter file
-file   --rw--  glogbook        xml     Garmin Logbook XML
 file   rwrwrw  gdb     gdb     Garmin MapSource - gdb
 file   rwrwrw  garmin_txt      txt     Garmin MapSource - txt (tab delimited)
 file   rw----  garmin_poi              Garmin POI database
@@ -46,7 +45,6 @@ serial        r-r---  dg-200          GlobalSat DG-200 Download
 serial --r---  globalsat               GlobalSat GH625XT GPS training watch
 file   --r---  googledir       xml     Google Directions XML
 file   rwrwrw  kml     kml     Google Earth (Keyhole) Markup Language
-file   --rw--  gnav_trl        trl     Google Navigator Tracklines (.trl)
 file   --rw--  land_air_sea    txt     GPS Tracking Key Pro text
 file   rwrwrw  gtm     gtm     GPS TrackMaker
 file   rw----  arc     txt     GPSBabel arc filter file
index bd42134e230ca6a75fef049d9979715f4cf486aa..0d5d28b55f3aaa62b6390cf4825d5234bbd17281 100644 (file)
@@ -258,8 +258,6 @@ option      garmin_g1000    prefer_shortnames       Use shortname instead of description    boole
 
 option garmin_g1000    datum   GPS datum (def. WGS 84) string                          https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin_g1000.html#fmt_garmin_g1000_o_datum
 
-file   --rw--  glogbook        xml     Garmin Logbook XML      glogbook
-       https://www.gpsbabel.org/WEB_DOC_DIR/fmt_glogbook.html
 file   rwrwrw  gdb     gdb     Garmin MapSource - gdb  gdb
        https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gdb.html
 option gdb     cat     Default category on output (1..16)      integer         1       16      https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gdb.html#fmt_gdb_o_cat
@@ -468,8 +466,6 @@ option      kml     rotate_colors   Rotate colors for tracks and routes (default automatic)
 
 option kml     prec    Precision of coordinates, number of decimals    integer 6                       https://www.gpsbabel.org/WEB_DOC_DIR/fmt_kml.html#fmt_kml_o_prec
 
-file   --rw--  gnav_trl        trl     Google Navigator Tracklines (.trl)      gnav_trl
-       https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gnav_trl.html
 file   --rw--  land_air_sea    txt     GPS Tracking Key Pro text       xcsv
        https://www.gpsbabel.org/WEB_DOC_DIR/fmt_land_air_sea.html
 option land_air_sea    snlen   Max synthesized shortname length        integer         1               https://www.gpsbabel.org/WEB_DOC_DIR/fmt_land_air_sea.html#fmt_land_air_sea_o_snlen
index 044c172eaa284a41fba1bba232da614d8bfef5a6..3f072052a989f6518e417a736a95886f879adab5 100644 (file)
@@ -137,7 +137,6 @@ File Types (-i and -o options):
          urlbase               Basename prepended to URL on output 
          prefer_shortnames     (0/1) Use shortname instead of description 
          datum                 GPS datum (def. WGS 84) 
-       glogbook              Garmin Logbook XML
        gdb                   Garmin MapSource - gdb
          cat                   Default category on output (1..16) 
          bitscategory          Bitmap of categories 
@@ -236,7 +235,6 @@ File Types (-i and -o options):
          max_position_point    Retain at most this number of position points  (0  
          rotate_colors         Rotate colors for tracks and routes (default autom 
          prec                  Precision of coordinates, number of decimals 
-       gnav_trl              Google Navigator Tracklines (.trl)
        land_air_sea          GPS Tracking Key Pro text
          snlen                 Max synthesized shortname length 
          snwhite               (0/1) Allow whitespace synth. shortnames 
diff --git a/testo.d/glogbook.test b/testo.d/glogbook.test
deleted file mode 100644 (file)
index a85f886..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Garmin logbook.   This format has an extra section (lap data with things
-# like heartbeat and calories burned) that we don't know what to do with,
-# so we convert it to gpx, convert it to itself, convert THAT to gpx, and
-# compare those.
-#
-rm -f ${TMPDIR}/glogbook*
-gpsbabel -i glogbook -f ${REFERENCE}/track/garmin_logbook.xml -o gpx -F ${TMPDIR}/glog1.gpx
-gpsbabel -i glogbook -f ${REFERENCE}/track/garmin_logbook.xml -o glogbook -F ${TMPDIR}/glog.xml
-gpsbabel -i glogbook -f ${TMPDIR}/glog.xml -o gpx -F ${TMPDIR}/glog2.gpx
-compare ${TMPDIR}/glog1.gpx ${TMPDIR}/glog2.gpx
diff --git a/testo.d/gnav_trl.test b/testo.d/gnav_trl.test
deleted file mode 100644 (file)
index 5a1e2e4..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#
-# Google Navigator tracklines
-#
-gpsbabel -i gnav_trl -f ${REFERENCE}/track/gnav_trl.trl -t -o unicsv,utc=0 -F ${TMPDIR}/gnav_trl~trl.csv
-compare ${REFERENCE}/track/gnav_trl~trl.csv ${TMPDIR}/gnav_trl~trl.csv
-gpsbabel -i gnav_trl -f ${REFERENCE}/track/gnav_trl.trl -o gnav_trl -F ${TMPDIR}/gnav_trl.trl
-gpsbabel -i gnav_trl -f ${TMPDIR}/gnav_trl.trl -t -o unicsv,utc=0 -F ${TMPDIR}/gnav_trl~trl2.csv
-compare ${REFERENCE}/track/gnav_trl~trl.csv ${TMPDIR}/gnav_trl~trl2.csv
-
diff --git a/vecs.cc b/vecs.cc
index 8e0939c2db01cc381242a1b61c085c7de3d58a6a..a106b716fff2c45a7ce88f285080526a4a8ebeb7 100644 (file)
--- a/vecs.cc
+++ b/vecs.cc
@@ -103,7 +103,6 @@ extern ff_vecs_t wbt_svecs;
 #if MAXIMAL_ENABLED
 extern ff_vecs_t wbt_fvecs;
 //extern ff_vecs_t wbt_fvecs;
-extern ff_vecs_t glogbook_vecs;
 extern ff_vecs_t vcf_vecs;
 extern ff_vecs_t google_dir_vecs;
 extern ff_vecs_t tomtom_vecs;
@@ -126,7 +125,6 @@ extern ff_vecs_t destinator_itn_vecs;
 extern ff_vecs_t destinator_trl_vecs;
 extern ff_vecs_t igo8_vecs;
 extern ff_vecs_t mapasia_tr7_vecs;
-extern ff_vecs_t gnav_trl_vecs;
 extern ff_vecs_t navitel_trk_vecs;
 extern ff_vecs_t ggv_ovl_vecs;
 extern ff_vecs_t itracku_vecs;
@@ -189,7 +187,6 @@ struct Vecs::Impl
 #if MAXIMAL_ENABLED
   LegacyFormat wbt_ffmt {wbt_fvecs};
 //LegacyFormat wbt_ffmt {wbt_fvecs};
-  LegacyFormat glogbook_fmt {glogbook_vecs};
   LegacyFormat vcf_fmt {vcf_vecs};
   LegacyFormat google_dir_fmt {google_dir_vecs};
   LegacyFormat tomtom_fmt {tomtom_vecs};
@@ -225,7 +222,6 @@ struct Vecs::Impl
   HumminbirdFormat humminbird_fmt;
   HumminbirdHTFormat humminbird_ht_fmt;
   LegacyFormat mapasia_tr7_fmt {mapasia_tr7_vecs};
-  LegacyFormat gnav_trl_fmt {gnav_trl_vecs};
   LegacyFormat navitel_trk_fmt {navitel_trk_vecs};
   LegacyFormat ggv_ovl_fmt {ggv_ovl_vecs};
   LegacyFormat itracku_fmt {itracku_vecs};
@@ -720,13 +716,6 @@ struct Vecs::Impl
       "tr7",
       nullptr,
     },
-    {
-      &gnav_trl_fmt,
-      "gnav_trl",
-      "Google Navigator Tracklines (.trl)",
-      "trl",
-      nullptr,
-    },
     {
       &navitel_trk_fmt,
       "navitel_trk",
diff --git a/xmldoc/formats/glogbook.xml b/xmldoc/formats/glogbook.xml
deleted file mode 100644 (file)
index 82a05b2..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<para>
-  This is the XML format used by the Garmin Logbook product
-  that ships with Forerunner and Foretrex.
-  As of early 2006, this program is apparently  been discontinued in favor of
-  <link  linkend="fmt_gtrnctr">Garmin Training Center</link>.
-
-  See: <ulink url="http://www.garmin.com">http://www.garmin.com</ulink>
-</para>
-
diff --git a/xmldoc/formats/gnav_trl.xml b/xmldoc/formats/gnav_trl.xml
deleted file mode 100644 (file)
index 06cf670..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-<para>
-   Binary (little endian) tracklogs containing coordinates, timestamps and altitude values.
-</para>
-
-<para>
-   <ulink url="http://www.pdafun.net/">Google Navigator</ulink> is an application for PDAs
-   running under Windows Mobile 5.0 or 6.0.
-</para>
-
-<para>
-  <table id="structure">
-    <title>Track point structure (16 bytes)</title>
-    <tgroup cols="3">
-    <thead>
-      <row>
-        <entry>Position</entry>
-        <entry>Data type</entry>
-        <entry>Field info</entry>
-      </row>
-    </thead>
-    <tbody>
-      <row>
-        <entry>0</entry>
-        <entry>32-bit signed int</entry>
-        <entry>Unix timestamp</entry>
-      </row>
-      <row>
-        <entry>4</entry>
-        <entry>32-bit float</entry>
-        <entry>Latitude</entry>
-      </row>
-      <row>
-        <entry>8</entry>
-        <entry>32-bit float</entry>
-        <entry>Longitude</entry>
-      </row>
-      <row>
-        <entry>12</entry>
-        <entry>32-bit float</entry>
-        <entry>Altitude (!rotated left by eight bits!)</entry>
-      </row>
-    </tbody>
-    </tgroup>
-  </table>
-</para>